bitkeeper revision 1.1202 (421094f3xaph8Fy7S7CActoJAtqz7g)
authormafetter@fleming.research <mafetter@fleming.research>
Mon, 14 Feb 2005 12:09:23 +0000 (12:09 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Mon, 14 Feb 2005 12:09:23 +0000 (12:09 +0000)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into fleming.research:/scratch/fleming/mafetter/xen.work

Signed-off-by: michael.fetterman@cl.cam.ac.uk
1  2 
xen/arch/x86/shadow.c

Simple merge